Skip to content

Avoid using __local as it collides with clc++ keyword #154020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Avoid using __local as it collides with clc++ keyword #154020

wants to merge 1 commit into from

Conversation

piotrrak
Copy link

No description provided.

@github-actions GitHub Actions
Copy link

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@github-actions GitHub Actions
Copy link

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command: 
git-clang-format --diff HEAD~1 HEAD --extensions ,cpp,h -- libcxx/include/__algorithm/copy.h libcxx/include/__algorithm/copy_backward.h libcxx/include/__algorithm/find_segment_if.h libcxx/include/__algorithm/for_each_n_segment.h libcxx/include/__algorithm/for_each_segment.h libcxx/include/__algorithm/move.h libcxx/include/__algorithm/move_backward.h libcxx/include/__cxx03/__algorithm/copy.h libcxx/include/__cxx03/__algorithm/copy_backward.h libcxx/include/__cxx03/__algorithm/find_segment_if.h libcxx/include/__cxx03/__algorithm/for_each_segment.h libcxx/include/__cxx03/__algorithm/move.h libcxx/include/__cxx03/__algorithm/move_backward.h libcxx/include/__cxx03/__iterator/segmented_iterator.h libcxx/include/__cxx03/deque libcxx/include/__iterator/segmented_iterator.h libcxx/include/__ranges/join_view.h libcxx/include/deque libcxx/src/experimental/include/tzdb/types_private.h libcxx/src/experimental/time_zone.cpp libcxx/src/experimental/tzdb.cpp libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp
View the diff from clang-format here. 
diff --git a/libcxx/include/__algorithm/copy_backward.h b/libcxx/include/__algorithm/copy_backward.h
index da9b91c9d..0e4a38bde 100644
--- a/libcxx/include/__algorithm/copy_backward.h
+++ b/libcxx/include/__algorithm/copy_backward.h
@@ -177,8 +177,8 @@ struct __copy_backward_impl {
     auto __sfirst = _Traits::__segment(__first);
     auto __slast  = _Traits::__segment(__last);
     if (__sfirst == __slast) {
-      auto __iters =
-          std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
+      auto __iters = std::__copy_backward<_AlgPolicy>(
+          _Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
       return std::make_pair(__last, __iters.second);
     }
 
@@ -192,8 +192,9 @@ struct __copy_backward_impl {
               .second;
       --__slast;
     }
-    __result = std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
-                   .second;
+    __result =
+        std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
+            .second;
     return std::make_pair(__last, std::move(__result));
   }
 
diff --git a/libcxx/include/__algorithm/move_backward.h b/libcxx/include/__algorithm/move_backward.h
index 6d8b31a1c..7997d34f7 100644
--- a/libcxx/include/__algorithm/move_backward.h
+++ b/libcxx/include/__algorithm/move_backward.h
@@ -58,8 +58,8 @@ struct __move_backward_impl {
     auto __sfirst = _Traits::__segment(__first);
     auto __slast  = _Traits::__segment(__last);
     if (__sfirst == __slast) {
-      auto __iters =
-          std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
+      auto __iters = std::__move_backward<_AlgPolicy>(
+          _Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
       return std::make_pair(__last, __iters.second);
     }
 
@@ -73,8 +73,9 @@ struct __move_backward_impl {
               .second;
       --__slast;
     }
-    __result = std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
-                   .second;
+    __result =
+        std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
+            .second;
     return std::make_pair(__last, std::move(__result));
   }
 
diff --git a/libcxx/include/__cxx03/__algorithm/copy_backward.h b/libcxx/include/__cxx03/__algorithm/copy_backward.h
index 1c0075319..3c360ee44 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_backward.h
@@ -51,8 +51,8 @@ struct __copy_backward_impl {
     auto __sfirst = _Traits::__segment(__first);
     auto __slast  = _Traits::__segment(__last);
     if (__sfirst == __slast) {
-      auto __iters =
-          std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
+      auto __iters = std::__copy_backward<_AlgPolicy>(
+          _Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
       return std::make_pair(__last, __iters.second);
     }
 
@@ -66,8 +66,9 @@ struct __copy_backward_impl {
               .second;
       --__slast;
     }
-    __result = std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
-                   .second;
+    __result =
+        std::__copy_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
+            .second;
     return std::make_pair(__last, std::move(__result));
   }
 
diff --git a/libcxx/include/__cxx03/__algorithm/move_backward.h b/libcxx/include/__cxx03/__algorithm/move_backward.h
index 244283206..93c637016 100644
--- a/libcxx/include/__cxx03/__algorithm/move_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/move_backward.h
@@ -52,8 +52,8 @@ struct __move_backward_impl {
     auto __sfirst = _Traits::__segment(__first);
     auto __slast  = _Traits::__segment(__last);
     if (__sfirst == __slast) {
-      auto __iters =
-          std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
+      auto __iters = std::__move_backward<_AlgPolicy>(
+          _Traits::__local_it(__first), _Traits::__local_it(__last), std::move(__result));
       return std::make_pair(__last, __iters.second);
     }
 
@@ -67,8 +67,9 @@ struct __move_backward_impl {
               .second;
       --__slast;
     }
-    __result = std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
-                   .second;
+    __result =
+        std::__move_backward<_AlgPolicy>(_Traits::__local_it(__first), _Traits::__end(__slast), std::move(__result))
+            .second;
     return std::make_pair(__last, std::move(__result));
   }

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@piotrrak